LPS-47192 Remove unneccessary arguments + sort