added message handler
cleanup delayed calls
cleanup