Comment out experimental code, ready for release