Removed all uneccassary code, still need to clean up more