Removed some sanity checks that are no longer needed due to the configuration sanity...