removed debug code
removed unused includes