cleaning up the code and removing useless codecs-imports from few files