Code cleanup
Hide unwanted modules
Merge branch 'develop'