Removed lingering code