Removed and commented unwanted functions