Switched to deployr for grouping. Comments, cleanups.