Final set of commits after doing final cleanup. Ready for pull request