simple fixes
Just portings from integration
Just removed useless imports (porting from integration)
Removed useless function