cleanup, must break c++ habit.