GEORDI-16: cleanup