Remove unnecessary use statement
Fix Hydratable type hinting and do some refactor