Revert "Merge branch 'Add-tracks-model'"

This reverts commit 52963a8fd71efb5b3d55f542eaec8b11bb1d67fa, reversing
changes made to 5a96ccef21f7094aede152397b670c241e17c74a.