Removed uneeded defaults