small optimizations
remove superfluous import