drop unnecessary code, fix small issues