Starting to clean things up here

Change-Id: Ib6c02963abe9716a7ff702c84de90aa4d97c77af