removed commented out dead code
Removed obsolete method