Removed dead code, added a TODO stub
Added an SA TODO