cleanup for cm10.2 merge