AOKP Cleanup