Removed unnecessary code

Got rid of some things that were no longer being used.