WIP: Communication Clean up