Type-hint fixes and unneccessary imports