Remove old pack code
Update current_path helper