Cleanup and Controller as request scope