Removed a few more unused vars and added some TODO comments