cleanup, resolves #432 - other than nodes/postings stuff