remove unnecessary comments
merging old branch
more cleanups
stats