Removed tools for optimizing

Change-Id: I0787b61544e9946062f087839d6ea389ad49a4d0