Remove extra loader and did some cleanup