Remove redundant control objects
Remove tricksy april fool's joke.
Merge pull request #259 from ywwg/autodj-fixes

Auto DJ fixes