cleanup needs CP

- remove un-needed double assertion
- improve assertion message
- extract controllers CP kick into into to improve readbility.