cleanups for 1.0