Clean up circleci.yml