removed unused function
cleanup
Finalised grouping