cleanup imports
Some memory optimizations