more comenting out unnecessary/unused code