remove return statements from fields