Some cleanups, putting this on hiatus for now