Cleaned up a handful of legacy files