remove parser and reorganize