Bugfix and add CleanUp sample controller