More error removal