cleanup derp

Change-Id: I554707856c733304f24b838c433eaa5980338030