Cleanup and configuration to work on production environment