Issue #570 : remove timer logic from code base
Issue #570 : remove advanced type from code base