some cleanup, trying to add core comm