Removed and commented out unnecessary code.