Fixing the build

Commenting out code is dangerous