Cleanup and adapted to latest changes in repositories

Change-Id: I9e71f959e19464e93b212591b59a50437cd2d55e