use correct name, and remove unused defaults