ignoring all error messages from clean up
Merge branch 'cleanup' into development

* cleanup:
  ignoring all error messages from clean up