Cleanups by kha