Remove unneeded arguments from blocks