Some more cleanups for V0.02