more cleaning and putzing

Change-Id: I4a04fce45568b92107473353f691985f86c0a8ea