LPS-47071 Do manual clean up whenever possible