Updated version, removed some useless log
Code cleanup