Removing return statements