diff --git a/includes/class-activity-dispatcher.php b/includes/class-activity-dispatcher.php
index 2a5444a..692c487 100644
--- a/includes/class-activity-dispatcher.php
+++ b/includes/class-activity-dispatcher.php
@@ -7,6 +7,7 @@ use Activitypub\Collection\Users;
 use Activitypub\Collection\Followers;
 use Activitypub\Transformer\Post;
 
+use function Activitypub\is_user_disabled;
 use function Activitypub\safe_remote_post;
 
 /**
@@ -21,9 +22,6 @@ class Activity_Dispatcher {
 	 * Initialize the class, registering WordPress hooks.
 	 */
 	public static function init() {
-		// legacy
-		\add_action( 'activitypub_send_post_activity', array( self::class, 'send_create_activity' ) );
-
 		\add_action( 'activitypub_send_activity', array( self::class, 'send_user_activity' ), 10, 2 );
 		\add_action( 'activitypub_send_activity', array( self::class, 'send_blog_activity' ), 10, 2 );
 	}
@@ -31,24 +29,27 @@ class Activity_Dispatcher {
 	/**
 	 * Send Activities to followers and mentioned users.
 	 *
-	 * @param WP_Post $post The ActivityPub Post.
-	 * @param string  $type The Activity-Type.
+	 * @param WP_Post $wp_post The ActivityPub Post.
+	 * @param string  $activity_type    The Activity-Type.
 	 *
 	 * @return void
 	 */
-	public static function send_user_activity( WP_Post $post, $type ) {
+	public static function send_user_activity( WP_Post $wp_post, $activity_type ) {
 		// check if a migration is needed before sending new posts
 		Migration::maybe_migrate();
 
-		$object = Post::transform( $post )->to_object();
+		if ( is_user_disabled( $wp_post->post_author ) ) {
+			return;
+		}
 
-		$activity = new Activity();
-		$activity->set_type( $type );
-		$activity->set_object( $object );
+		$post = new Post( $wp_post );
 
-		$user_id           = $post->post_author;
+		$activitypub_activity = new Activity( $activity_type );
+		$activitypub_activity->from_post( $post );
+
+		$user_id           = $wp_post->post_author;
 		$follower_inboxes  = Followers::get_inboxes( $user_id );
-		$mentioned_inboxes = Mention::get_inboxes( $activity->get_cc() );
+		$mentioned_inboxes = Mention::get_inboxes( $activitypub_activity->get_cc() );
 
 		$inboxes = array_merge( $follower_inboxes, $mentioned_inboxes );
 		$inboxes = array_unique( $inboxes );
@@ -60,34 +61,35 @@ class Activity_Dispatcher {
 		}
 	}
 
-		/**
+	/**
 	 * Send Activities to followers and mentioned users.
 	 *
-	 * @param WP_Post $post The ActivityPub Post.
-	 * @param string  $type The Activity-Type.
+	 * @param WP_Post $wp_post The ActivityPub Post.
+	 * @param string  $activity_type    The Activity-Type.
 	 *
 	 * @return void
 	 */
-	public static function send_blog_activity( WP_Post $post, $type ) {
+	public static function send_blog_activity( WP_Post $wp_post, $activity_type ) {
 		// check if a migration is needed before sending new posts
 		Migration::maybe_migrate();
 
-		$user = Users::get_by_id( Users::BLOG_USER_ID );
+		if ( is_user_disabled( User_Factory::BLOG_USER_ID ) ) {
+			return;
+		}
 
-		$object = Post::transform( $post )->to_object();
-		$object->set_attributed_to( $user->get_url() );
+		$post = new Post( $wp_post, User_Factory::BLOG_USER_ID );
 
-		$activity = new Activity();
-		$activity->set_type( $type );
-		$activity->set_object( $object );
+		$activitypub_activity = new Activity( $activity_type );
+		$activitypub_activity->from_post( $post );
 
-		$follower_inboxes  = Followers::get_inboxes( $user->get__id() );
-		$mentioned_inboxes = Mention::get_inboxes( $activity->get_cc() );
+		$user_id           = User_Factory::BLOG_USER_ID;
+		$follower_inboxes  = Followers::get_inboxes( $user_id );
+		$mentioned_inboxes = Mention::get_inboxes( $activitypub_activity->get_cc() );
 
 		$inboxes = array_merge( $follower_inboxes, $mentioned_inboxes );
 		$inboxes = array_unique( $inboxes );
 
-		$array = $activity->to_array();
+		$array = $activity->to_json();
 
 		foreach ( $inboxes as $inbox ) {
 			safe_remote_post( $inbox, $array, $user_id );