Comment out incompatible stuff for now