removed all useless stuff that wasn't working to make it tidier