add support for experimental builds
and cleanup

Change-Id: Ib1ce4e4687960960c38e339b8ce0030656328c0d