Removed unnecessary defaults being called