remove demo and make it external