Merge "Code cleanup." into experimental