LPS-47071 Do manual clean up whenever possible
LPS-47071 This is implied already
LPS-47071 This is implied already