Remove references to disc or emission