removed junk code, added new parsers