initial cut.
cleanup