Make markup non-configurable, remove db columns.