removed obsolete outcommented stuff.