Removed old unfinished code