Clean code and remove UDP