remove temporary test
remove temporary test
small cleanups