Starting the Great Form Purge of O-13
Phase 1: Basic cruft removal!

Change-Id: I519b7ec93a86e205d337c2963f4db77ac0d88afc