Cleaning up with latest command line tools