Saving commit, while testing building cleanup.