Removed unesscary defaults