Clean up deprecated folders