cleanup part one
cleanup part two.