Removing stuff that shouldn't be here :/