Feature/misc

* removes unused code
* add 'polling' to network when saving.