Removed some defunct code