Cleanup + attempt to fix LPS-37433