Cleanup some timeline stuff