Massive clean-up

But the bug on removing tracks is still there