CON-1821: Remove extend function