added trims to get correct timestamps
removed trac specific stuff