Removed old outcommented code.