misc code improvements.
deleted stub comments