Remove arguments deprecated after Diablo

Change-Id: Ia65ee002ad2aa2b6d2401586d1e06b8ffdb633dd
Closes-Bug: #1279483