Remove unnecessary defaults