code cleanup. removed debug messages.