22/05: Initial removal of handles