Remove un-needed crap #1