Remove commented legacy form code