Removed old functions, comments