1. Enable delay trigger feature
2. Code clean up

---------------
Submitted By: Roman Lo