Remove dependency on pystache