GLUG-2 initial clean up