code cleanup, removed debug statements