most deprecated methods removed, small code reformat

moved to use Loaders