Remove unneeded delays. Code cleanup.