remove a couple of old unused #defines