Removed more system.time statements