removed non-called methods
Fixed parsing