Removed unnecessary Code