Updated installation guide and cleanup

Change-Id: I128fe0e867b5dea05ce10759cb1c5145defc84ab