Make the apply on return configurable
Cleanup