Clean up and GRiMS Engine addition
Cleaning and updating GRiMS