todo removal - no longer needed