Merge "Do proper cleanup" into sc-dev