cleanup, merge aokp