fixed exception raising, removed unused class methods, ...