Removed logging and optimized imports