Merged more new CAF stuff
Removed garbage file