Remove file watcher from main file & update specs to match.