delete some more noise, put args in consistent order (a big bug trap sadly),