Modify for omni rom and clean up leftover cyanogenmod stuff