remove things brought in from bare bones branch