Cleanup of darthpelo's merge