cleanups before turning into production code