remove dependendency on acceptance