Fix old references to deleted files
A bunch of shit
More shit