remove debug messages. Seems to work