Removed old comments and unused functions.