Parser clean up