Remove Rubik namespace leftovers