Removing demonstration code