Code cleanup and more updates for version 2.35