Dropping pre-refactor code