removed obsolete out commented code