Remove watch-statement from default builds