update and clean-up

Change-Id: I452013965a9d72f0c5f16eda9fc729f527f60fbe