fixed fetching bug
added cleanup after deployment
Merge branch 'master' into develop

* master:
  added cleanup after deployment
  fixed fetching bug