removed un-needed timeout