remove un-needed double assertion, and improve assertion message
Pull Controller#controllers CP Kick into init.
Merge pull request #3279 from stefanpenner/remove-needs-double-assertion

cleanup needs CP