Remove unused imports
make compatibility classes more obvious + fix some issue