Removed some unneeded files, added a TODO