clean fixes

Change-Id: I3ea6d3e94dec593f0717000a834eba6217ae064c