removed data parser from this branch