fixed cmm-list bug
removed some commented stuff