Removing return statement that would never be reached