Cleanup streamFor
Remove group support