Removing Some Unused Stuff