Remove unused backward compatibility. Re-arrange code
Add *.log to gitignore