Removing more things that shouldn't be in prod

Change-Id: Ie1818795beb730a83001764633a442aeeaceb390