Removed Old Unused Code