Cleaning up from code removal.