Some cleanups, old things removed