Remove the use of None