cleanup from pre_processor refactor