Updated unit handling to remove un-needed gists.