Delete unused code, add timer