remove defined check and stop

Change-Id: I15be55ec88eee8fb85a350a5dbfd6c064677f4e0