title change and removed unused code