Old parser code removed, new stubs added