Revert "Misc. STS files"

This reverts commit 328d695c7fc35ccdd41ff05219da3fac4ce97c30.