Removed file watch in favor of polling for speed and stability improvement