Workspace: Small cleanup

Change-Id: I9fed548754c96d9a81f3aac142edf1cdd8a1b4f5