cleanup part one and do part two