Cleanup, temp workaround

until network is active