Refactoring to use Loaders fixes #2365 

Not all Threads were removed, but it it fixes #2365