Reverting a bunch of junk in favor of incremental enhancement