removed obsolete guard