remove uneeded empty arguments
try to match parameters in pyql
fix whitespace
calendar and evalDate are not used anywhere