fix exceptions
remove obsolete method