Removed grouped code from master branch