Stk: Cleanup CAF additions

Change-Id: I4ed2e5c5bd4ffbdd7732dd8efcd5b67b8325fa9b