remove dead code
fix timeline
merged