Clean up deploy script and circle.yml