Remove redundant imports and a redundant instance