cleanup and merge - aokp