Build 35 and some cleanup.