Added sending without registered number + code cleanup