slimify cm-10.2 branch to make merging easier