Remove unifier and general gardening