Remove discontinued code