Remove NoneType + Remove decode