Cleanup + GMF fix