remove dependency to previous architectural mess