Remove all the faffing