More power cleanup