removed system structure until rewrite