removed debug messages and such stuff