Removed old behavior 'type' logic