Spring cleaning on some files that aren't used anymore