clean unecessary code to first version - events, samba like