Remove un-needed makes

Change-Id: Iba0895141e9860069913ece3f89e573facc0a969