Remove unnecessary packages and imports