dev/core#1482 Remove lines of code that appear to relate to legacy logic