Remove some unused imports created by the previous commits