Removed explicit parsing functions and data structures