less debug output.
fix bug in remove