Cleanup drama a bit