Clean Up + Admin menu Entries

Removed all not longer needed code
Merge remote-tracking branch 'origin/develop'