remove unused exception class and cleanup tests

Change-Id: Ie8def9f5b20b32df33c5447308784d2232c8a180