Simplify Timed protocol and some code cleanup