Upgrade CM, remove binary duplication