Block: Clean up handling of non-User targets