Removed tons of junk in the code trunk