IPC layer refactors and cleanup