Fixes #9
deleted obsolete class
#13
#10
#13