Simplify a bit . Removed obsolete comment