Cleanup and remove extra error message.