FIX: comment out lines which were not compiling