General SIP-14 Future method implementation cleanup