Deleted Lots of Unneeded Code