Removed unnecessary logging and added some performance timers