Removed dependency and commented out unused code.