Clean up logic for legacy manager