Codegen tweaks - Timer removed.