Some unused imports and misc stuff