Added delete capability to config tool and server
merge