Removed unnecessary optimization