Move logic to Timeline controller / remove unused models