Fixing some issues found by trying brackets again.
Getting rid of old files sitting around.