cleanup of old logic
4.1.0