Switch delete response code to 204

* Also fixed a couple pep8 problems.

Change-Id: Ib0e8fdb0d0fe9f38433190d2ccd472cd53a31bb9
Merge "Switch delete response code to 204"