Removed/reduced some delays