neighbors cleanup
need to rethink usage of promises