removed some debug traces / raw_input