removed commented code, removed log...