general cleanup
removing errors