remove cm stuff

Change-Id: Ie51e53a9b078372e199a45b5e3229f35689966a3
Remove more AOKP stuff

Change-Id: I7ec2f9b166a59d520ea46ec6fb6a3bd1062603bf