little cleanup and error killing