General clean up for AOKP