clean up + some debug output disabled