FWaaS delete actions are implemented in an unusual way and have a lot of unnecessary code. This change makes some clean up. Closes-Bug: #1492281 Change-Id: Ie58f4be5a2fa1142897669e5f85bc8c983795baa