Remove old, unused code