Remove kwargs which are not needed anymore