More feature header/footer cleanup, remove deprecated mixins