Source cleanup. Get still slow