removing unused func
fixing parse bug