SCA clean up