cleanup dev code preface | move to feature branch