Removed old functions, added doc