More error removal.