comment out border-radius mixins, clean up some other mixins