Fixed imports and removed unnecessary commented code