Clean old weird code