Code clean

	* Removed some functions not in use
	* Removed unnecessary variables