Removed unnecessary code that was commented out and some other style fixes.
Merge branch 'master' of git@github.com:searchdaimon/enterprise-search
Silenced noisy printf.