misc cleanup no new features