removed superfluous debug messages
cleaned up a bit