Removing unnecessary defaults