Removing stupid crap
Trying to merge