Cleanup some unused code and configuration entries