Cleaning up. First two steps done.