Import fixes

Added imports where they were missing
Removed unnecessary import of common