Clean up for AOKP