Removed an unused file, cleaned up some TODOs.