Remove references to clas (no cheating)