Clean old code