Implementing communication - cleaning not used code