Commenting out unneeded stuff for OKAM