Cleanup, add egress files