cleaning up some unnecessary files, adding TODO