Cleanup cas-client being doubly included