Gulp added, and additional cleanup