File cleanup

Cleanup any remnants of STS/RSA/EMC from these files.
The files are a bit more generic. Some could still use some work.
Merge branch 'duane-clean'