removed non-cirqus stuff