Removed Unnecessary Code