remove unused code
change labels