Remove unused member variables and imports.
Rename point-to-point 'sync' folder to 'single'.