Getting rid of leftover arguments