Class move
Remove unnecessary IOPS
Class move
Command fixes