Remove Loader and unused code.