Fixed to remove some unneeded code (commented out stuff and such) :guitar: