Unwanted functions deleted. And some functions updated.