Clean up a few things

Change-Id: Ie15f82fc56496cb4a15737f916cc47f604f50a65