Performance improvements and spock helper

* Added newer to the watch task
* Removed libraries from watch