Changes to reflect cyclopts deletion

Now that its gone