Remove almost deprecated arguments