more error code cleanup