cleanup and merge -  aokp