Removing a bunch of junk code