Auto DJ fixes

Remove redundant control objects
Also remove tricksy april fool's joke.