removed debug code, cleanup