Removing stale code