Removed some stale code