Removing unused classes
Moved creation of listener outside receiver class ; preparing for merging the replication code