Made simplified case parser to fit into DataSource. Removed some unused files.