Fix imports and remove extraneous logger class