Remove parts of pure check, also comment out new FS code for now