Remove last bits of parse code