Cleaning up some custom code that was blocking sane defaults