removed obsolete coding