Remove redundant imports and suppressed warnings