Fixed imports and removed dead code