Removed cruft around unused constant definitions and extraneous requires