cleanup, implement ast search methods