gmc: Did some cleanup