Removed floater and migrated updates as per #1848