ARG-18: Clean up