Switched to ADT for now, more code cleanup of unused stuff, as well as
remove "2E" b/c at this point it's confusing, correct next/previous bug,
etc.