Remove check on number of arguments