Remove some old code [closes #406]