Removing hard-coded defaults