some import fix
remove unused stuff
path dependent types
objects fix