Removes NoneType dependency