Remove refs to Statement in Statement class