Big cleanup of auto DJ code