[BUFGIX] cleanup some dev related stuff

Change-Id: Ie60a6f785465def149dfb9b15c5a8569c834dcda