Removing unused imports and unecessary strictness annotations