Removing dead files and fixing refs