Removed deprecated 2.2 calls in form types