remove comments
remove trigger* functions and expand it.