Dependency clean up, enable public clients and 
remove BC from required modules