Remove automatic cleanup in 'up', add interval-based cleanup to 'watch'