cleared unused code