Removing setTimeout stuff