Removing unneeded legacy setting & fixing whitespace