cleaning up for group dev