Removed all the junk again