Remove blocks from GroupBy Code
Just trying to simplify things...

Currently fails (locally at least) with 5 tests, which interestingly enough seem mostly related to `mean`. Need to debug further but submitting now for feedback