Fixed parser bug, deleted redundant files