Optimized imports, removed some deprecated staff