Remove parameters from function as well #4194