Cleanup loaders & config
Cleanup