Encoding fix

Removed commented out imports too