Refactor out remaining code reeks