Removed some unused scripts, minor fixes

Change-Id: If725f34ae587d7f6a63c6ee14ec1c83c9fddf708
Updated reference

Change-Id: I6857a29664478a58c6e0465d71df2eba4f2a3b33