cleanupgh fixes