Some groovy changes I did not commit right away
Deleted outdated classes