remove cleaner/add error code detection