Cleaned up GE initialisers to work with 2.0 framework