Update version number and clean-up

Change-Id: Iec07bdb42636d662fca6075ff171b440f71478f7