Organize imports and remove unused method