PASDK-218:Clean up