Added timing logs and cleaned out unused stuff