Commented unused code for the time being