Removed old code, in preparation of new code