code clean up, some debug data clean up