additional cleanup of shaz theme