Dev area cleanup for 0.14 testing

Change-Id: I455dd14aa816be41cb81d03764983dc3cffd1ca4