Removed old MODE code in preperation for rewrite