Version up & cleanup

Change-Id: I4be4a733f4591a1e418972f2817f0e909bab1e9d