Trim unused imports and code :fire: