Removed obsolete indirection