#2 remove unused code