removed unnecessary defaults