Removed some debug code.
minor fixes