Cleaning up Griffon reference