clean up of codes
remove demo codes