Remove unused code #3 #4