remove useless exception class
small fixes