Removed old/useless code