RIP bind-files + sir Trevor fixes