Remove unnecessary parsing of defaults