clean compltation with supervisedid 2.0.0, fix energy switch procedure