Use lightsaber version of functions, remove local version