Removes added use of R.string, and added some TODOs