removed further unused code