LPS-32454 these are not needed anymore, right?