Much cleanup (gulp hint); Unit tests skipped