Removed useless stuff in loader