Fix #61 and remove unnecessary code
Fix #61 and remove unnecessary code

vlucas/spot2,geggleto/spot2,splio-aleroux/spot2,NekaKawaii/spot2,willemwollebrants/spot2,localheinz/spot2,mitschool/spot2,tuupola/spot2