Cleanup after testing
Lost changes revived
Missing commit
Added missing location management
Added missing crontab for root