Added/Removed unnecessary apis