Removed/added stuff based on the CM10.1 repo