Removed all self closures