cleaned up old comment payload code