Add circplus, remove things we do not use.