Issue #161 Remove usage of obsolete classes