Deleted obsolute comments
Commented out unused code