Remove arguments, clean up