Remove pointless import
Remove duplicate code