Clean up ArgumentsResolver