Revert "Some Internal Cleanup - This will need a Groovy Internal Expert to ensure there is no bugs in this."

This reverts commit 90b0b69dd345cccc1ef11c4c0f6ec2864ee8022a.