LPS-49532 Removes no need code