Removing unneccessary delays