Remove deperecated code.