Reorder actions; remove excess import definition