Removed unnecessary delays