FIXME's, TODO's, and deleting unused code