fixes in deinstalling part of the package
Cleanup dublicate entry
Merge branch 'development'
  - Code cleanups