Remove unneccesary 'None' from .get() statements