Cleanup, still working on track loading