further clean up llama code