Correctly remove things I moved

Change-Id: If0050ee3e32a257257d5d62739d39c7a09cd17b9