Removed a bunch of D7 code.