Removed Some Unused Code