More bit rot cleanup