Removed Unused Code