Fix derp and clean up

Change-Id: I12a4ee370d9c868a8f4136da271e4681edd5a0c3