Further update to remove compatibility and deprecated module