Removing DSTL code