removed legacy functionality