Removed dead imports and unused test case