Cleanup, add player directive