cleaning up master and removing dev files